Revert 06c01b8..5a4e48e

This rolls back to commit 06c01b8ed8dcf9b31b49ae02adaf0c71f981e429.