Revert 7b14cc5..070e2d6

This rolls back to commit 7b14cc56d372503342f0cd927f7035c955220632.