Revert 3a44d57..cda8c46

This rolls back to commit 3a44d5734fdb7d87ef760054c4737c78df6e455e.