Revert a2cdcf9..c682a3d

This rolls back to commit a2cdcf9e1de38af6acf6ea8f2dd9e1cc628feaea.