Revert 4b7a041..1b95000

This rolls back to commit 4b7a0416c782f732d8488726e1463beb19848748.