...
Revert 5fe57c8..24d2dfe

This rolls back to commit 5fe57c84d8cdae00dbae55e643ac31600ae4bf46.
Revert 24d2dfe..540669c

This rolls back to commit 24d2dfe89efc5583d7f834f177c08bad9011718c.