Revert 7462789..f754de2

This rolls back to commit 7462789fec288d97fd3381a64557116d52f33310.