This partially reverts a change in behavior introduced in 2a111c99.
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 7e60c743)