Revert 180617e..b20b42c

This rolls back to commit 180617e38cc2ec5e67ffd4fb3dee6bc5ee53f68d.
Revert "Revert 180617e..b20b42c"

This reverts commit 9230f93259132141beec76b32209c242b2bad432.
Revert 180617e..e1fe0bb

This rolls back to commit 180617e38cc2ec5e67ffd4fb3dee6bc5ee53f68d.