Revert 684849e..714a694

This rolls back to commit 684849ee2f9e927823fde62f3ce0ceacae9ff5ae.