Revert 43d87af..de41fd1

This rolls back to commit 43d87af78ccaea410b1f03b1a8d9b1a881c27f8a.