Revert 70deac9..51a5041

This rolls back to commit 70deac90c1832ca28db9c0a6336c4b5cf2aaf643.