Revert f0663f4..8bddc7d

This rolls back to commit f0663f45416b8e02f7f6fcc7e884bfd8158592a6.