Revert 74b7888..72fc95c

This rolls back to commit 74b7888fd9e3849e22e6118815b305ef4bdfd765.