Revert 1bec98b..72a0720

This rolls back to commit 1bec98b63e5d803820f9d00c3819d05819792396.