Revert 87335c4..2bdf63e

This rolls back to commit 87335c455d639f43f5541bc11713c3b8cdcbc139.