Revert fc4c4e7..afad25e

This rolls back to commit fc4c4e725f34ef6bbb8d31db83b11273bfa9f364.