Revert 54a3f5b..ccb19a1

This rolls back to commit 54a3f5b86c135915522fd44793e0e3b835867881.