Revert 9287ab3..cbba0d0

This rolls back to commit 9287ab3cfb6bd88aed4ab06e649d97deac0d6185.