Revert 432da4f..b1aa78a

This rolls back to commit 432da4ffcf1543328e731b413826adbd862c9464.