Revert 1dcf2ca..474217d

This rolls back to commit 1dcf2ca7476c4d8f76cd23d9857fa94889d5f761.