Revert 28f0bbe..497cc12

This rolls back to commit 28f0bbedbf5c9cb1f299022509a3c881616d3986.