Revert b9d68db..a47942e

This rolls back to commit b9d68db42ba367081956b0690fb1b8b2a1d9c4a6.
Revert 9eea46c..90439be

This rolls back to commit 9eea46c0ee0c64b67a1a51710a4a40f7c88927f3.