Revert 3ed6bf3..06b460b

This rolls back to commit 3ed6bf3d84eb4520fbe3942ed2a747f54b2ed95f.