Revert d1cc75e..25193ab

This rolls back to commit d1cc75e31b75650b41b3c59b21f998caddf96705.
Revert 25193ab..a49a442

This rolls back to commit 25193ab41446380cbc58572100e7af9b87c0441c.