Revert d138f87..3fc6542

This rolls back to commit d138f879405288d05ea22e113ace624803c3d6aa.