Revert 20563bd..510d935

This rolls back to commit 20563bd1158c6b65b91e3f8cbeb1b9e20640c393.