Revert 1dae3aa..09f5dee

This rolls back to commit 1dae3aa468a218f608307086c2059a5104441605.