Revert 12dbb25..677978e

This rolls back to commit 12dbb25ef19a3c4c3898c8bbbe4c3b99e3b25e72.