Revert 012f9ed..a1bf9e4

This rolls back to commit 012f9ed4c92fec7314c3e5eceee5f6ed05dccc01.