Revert 0f4e244..860d893

This rolls back to commit 0f4e24422ebd03472e14383610b0aed32c237429.