Revert a8b7fca..bf6e8f4

This rolls back to commit a8b7fcae649a8a8669eae3d35745cff53c3db01f.