Revert 29401d9..8361a01

This rolls back to commit 29401d90048e10dec468ac30519cf1faf6646fbe.