Revert 4d6441e..45be055

This rolls back to commit 4d6441e7036eea6b649bfec8d2d76849c7fefbb1.