Revert 43e0918..27f60cd

This rolls back to commit 43e09186e52da9a263f954b1fad992b77b1ce50d.