Revert 2f507f4..ef2a07e

This rolls back to commit 2f507f478fa24ba6e8b42c1c6ed2571456517df9.