Revert 6ff94fa..21690c0

This rolls back to commit 6ff94fa9d947c8e3358da9925f6e5cc82a28deed.