Revert d2924a3..46bd7b1

This rolls back to commit d2924a340ce4f232c7b32e497ff7ce42c9d54a66.