Revert 0bd6c36..0a56bba

This rolls back to commit 0bd6c36173c4071d36db8fc4e0a23d93b9ee15d7.