Signed-off-by: James Almer <jamrial@gmail.com>
This reverts commit 62f5c9d68bf6e0f2c1a47cf002629a70a82274fc, which was pushed a bit prematurely.