Revert 1c28bab..60a04e8

This rolls back to commit 1c28babec535ef15269e2f5b8f7eb81321a26f6e.