Revert 01612bc..9c9c01e

This rolls back to commit 01612bcdd9a316bf1b1968082b7bf6d0b92f92f3.