Revert 896fd05..a731dbd

This rolls back to commit 896fd05ef9ae7e3f049347f0e314769f38dbd646.