Revert 54786bd..e904b7b

This rolls back to commit 54786bde96620c1b717ecf09b7148118520d478b.