Revert 43c91c2..2551b2e

This rolls back to commit 43c91c20917e58d5a0bac2dad1b84eed76d2dedc.