Revert 28fd5f4..d4c15cf

This rolls back to commit 28fd5f448b2e5e7be024f4c57c22564e13389174.