Revert 444b486..2d662a3

This rolls back to commit 444b486e530dc936b9f29e769d9aba9fd20b5414.