Revert a3d1df4..7484688

This rolls back to commit a3d1df4c9f118a958c7793b50950d9a07cda6ad7.