Revert 9098176..8ed0b6b

This rolls back to commit 909817640a2f80b4fda516f8a424c2ed15a510d1.
Fixed?