Revert 50368c3..97179f4

This rolls back to commit 50368c398b3ec92430f3905f4fdb6d79f42b53c6.