Revert 2294c1a..b8280f0

This rolls back to commit 2294c1abd61f80a46e910814f25b01b4a4a9f7c5.